Deprecate h/v subclasses of GtkSeparator

This has been discussed in bug 541009.

diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c
index 49b31d0b9b39d530c6c1a3099bfe51e8a03e38d5..53e99fc0cf50b0e8666b5024bc538b3941b6ecbe 100644 (file)
--- a/gtk/gtkhseparator.c
+++ b/gtk/gtkhseparator.c
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkhseparator.h"
 #include "gtkorientable.h"
 
@@ -46,6 +47,8 @@
  * widget using gtk_separator_menu_item_new() and add it to the menu with
  * gtk_menu_shell_append().
  * </note>
+ *
+ * GtkHSeparator has been deprecated, use #GtkSeparator instead.
  */
 
 
@@ -69,6 +72,8 @@ gtk_hseparator_init (GtkHSeparator *hseparator)
  * Creates a new #GtkHSeparator.
  *
  * Returns: a new #GtkHSeparator.
+ *
+ * Deprecated: 3.2: Use gtk_separator_new() with %GTK_ORIENTATION_HORIZONTAL instead
  */
 GtkWidget *
 gtk_hseparator_new (void)

diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h
index 4cda938477dd275297e00961e4da723e98cc9222..d93ca9601130f315725225414a2a9d690e329afc 100644 (file)
--- a/gtk/gtkhseparator.h
+++ b/gtk/gtkhseparator.h
@@ -31,6 +31,7 @@
 #ifndef __GTK_HSEPARATOR_H__
 #define __GTK_HSEPARATOR_H__
 
+#ifndef GTK_DISABLE_DEPRECATED
 
 #include <gtk/gtkseparator.h>
 
@@ -65,4 +66,5 @@ GtkWidget* gtk_hseparator_new      (void);
 
 G_END_DECLS
 
+#endif
 #endif /* __GTK_HSEPARATOR_H__ */

diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c
index f2dcf81b70c49c943fa76df2946391d580a2eac7..9fb5f92e77efb7594df67acdad6243b0cc6ac586 100644 (file)
--- a/gtk/gtkvseparator.c
+++ b/gtk/gtkvseparator.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "gtkorientable.h"
+#undef GTK_DISABLE_DEPRECATED
 #include "gtkvseparator.h"
 
 
@@ -39,6 +40,8 @@
  * The #GtkVSeparator widget is a vertical separator, used to group the
  * widgets within a window. It displays a vertical line with a shadow to
  * make it appear sunken into the interface.
+ *
+ * GtkVSeparator has been deprecated, use #GtkSeparator instead.
  */
 
 G_DEFINE_TYPE (GtkVSeparator, gtk_vseparator, GTK_TYPE_SEPARATOR)
@@ -61,6 +64,8 @@ gtk_vseparator_init (GtkVSeparator *vseparator)
  * Creates a new #GtkVSeparator.
  *
  * Returns: a new #GtkVSeparator.
+ *
+ * Deprecated: 3.2: Use gtk_separator_new() with %GTK_ORIENTATION_VERTICAL instead
  */
 GtkWidget *
 gtk_vseparator_new (void)

diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h
index 62c7bf50e1a0b1bd3ddb17fd84fbd2dce6375075..0ff262fea20c5d1bb4af1017cf9684e7c8da5c8a 100644 (file)
--- a/gtk/gtkvseparator.h
+++ b/gtk/gtkvseparator.h
@@ -31,10 +31,10 @@
 #ifndef __GTK_VSEPARATOR_H__
 #define __GTK_VSEPARATOR_H__
 
+#ifndef GTK_DISABLE_DEPRECATED
 
 #include <gtk/gtkseparator.h>
 
-
 G_BEGIN_DECLS
 
 
@@ -72,5 +72,6 @@ GtkWidget* gtk_vseparator_new      (void);
 
 G_END_DECLS
 
+#endif
 
-#endif /* __GTK_SEPARATOR_H__ */
+#endif /* __GTK_VSEPARATOR_H__ */